[pull] main from glitch-soc:main#523
Open
pull[bot] wants to merge 1801 commits intoCompostInTraining:mainfrom
Open
[pull] main from glitch-soc:main#523pull[bot] wants to merge 1801 commits intoCompostInTraining:mainfrom
pull[bot] wants to merge 1801 commits intoCompostInTraining:mainfrom
Conversation
…oc/merge-upstream
Port ed4787c to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port c118ff7 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…ditor Port 39ff07b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 8e7c397 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream changes up to 8e7c397
Co-authored-by: GitHub Actions <noreply@github.com>
…posted in over a week (mastodon#37928)
…oc/merge-upstream Conflicts: - `.prettierignore`: Upstream removed it, replaced by `.oxfmtrc.json`. We had glitch-specific files in there. Updated `.oxfmtrc.json` accordingly and removed `.prettierignore`. - `config/formatjs-formatter.js`: Upstream switched to `oxfmt` from `prettier`, and some rules are slightly different. Glitch-soc had extra code in there. Reformatted appropriately. - `eslint.config.mjs`: Upstream moved some configuration from `eslint.config.mjs` to `.oxfmtrc.json` where glitch-soc had slightly different configuration. Removed it from `eslint.config.mjs` as well and updated `.oxfmtrc.json` accordingly. - `package.json`: Upstream changed script definitions textually adjacent to one that we have modified. Applied upstream's change, keeping the textually adjacent modified script intact.
Merge upstream changes up to e24737c
…oc/merge-upstream
…a collection Port 68a7cd4 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
… haven't posted in over a week Port 3d33294 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream changes up to 6ba6285
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>
…red tags or accounts Port 7d58ce3 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 69b1f60 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream changes up to 64629ea
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…oc/merge-upstream
Port 316290b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…action helper Port 9916c78 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port f971670 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 12c6c6d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 2093275 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 4a08ab6 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 3ef7d28 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Merge upstream changes up to 811575a
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
11 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )